Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Thu, 14 Dec 2017 20:46:07 +0000 (15:46 -0500)
committerTom Rini <[email protected]>
Thu, 14 Dec 2017 20:46:07 +0000 (15:46 -0500)

Trivial merge